Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

gh-79218: Define MS_WIN64 macro for Mingw-w64 64bit on Windows #100137

Merged
merged 3 commits into from
Dec 12, 2022
Merged

gh-79218: Define MS_WIN64 macro for Mingw-w64 64bit on Windows #100137

merged 3 commits into from
Dec 12, 2022

Conversation

GalaxySnail
Copy link
Contributor

@GalaxySnail GalaxySnail commented Dec 9, 2022 •
edited by bedevere-bot
Loading

@GalaxySnail GalaxySnail requested a review from a team as a code owner December 9, 2022 15:08
@bedevere-bot bedevere-bot mentioned this pull request Dec 9, 2022
Open
@netlify
Copy link

netlify bot commented Dec 9, 2022 •
edited
Loading

✅ Deploy Preview for python-cpython-preview canceled.

Name Link
🔨 Latest commit ae312e4
🔍 Latest deploy log https://app.netlify.com/sites/python-cpython-preview/deploys/639355159341490008c61bda

@cpython-cla-bot
Copy link

cpython-cla-bot bot commented Dec 9, 2022 •
edited
Loading

All commit authors signed the Contributor License Agreement.
CLA signed

zooba
zooba reviewed Dec 9, 2022
View reviewed changes
Copy link
Member

@zooba zooba left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can be simplified down to only define MS_WIN64, as the other variables are always defined unconditionally in this file.

(If Mingw isn't using the MSBuild files, then this change needs to go into the autoconf files for the generated pyconfig.h. This header file is only used by the PCbuild build files, not via make.)

PC/pyconfig.h Outdated Show resolved Hide resolved
PC/pyconfig.h Outdated Show resolved Hide resolved
@GalaxySnail
Copy link
Contributor Author

This can be simplified down to only define MS_WIN64, as the other variables are always defined unconditionally in this file.

Fixed.

(If Mingw isn't using the MSBuild files, then this change needs to go into the autoconf files for the generated pyconfig.h. This header file is only used by the PCbuild build files, not via make.)

If cpython is compiled by MSBuild and cython extension is compiled by mingw-w64 (which is the most common case, I think), it works. If someone (for example, msys2) wants to compile cpython itself by mingw-w64, many patches will be required anyway.

zooba
zooba approved these changes Dec 9, 2022
View reviewed changes
Copy link
Member

@zooba zooba left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good to merge once CI passes

@zooba zooba merged commit 158b8a0 into python:main Dec 12, 2022
carljm added a commit to carljm/cpython that referenced this pull request Dec 14, 2022
@carljm
Merge branch 'main' into typedocs
53d33a1 
* main: (103 commits)
  pythongh-100248: Add missing `ssl_shutdown_timeout` parameter in `asyncio` docs (python#100249)
  Assorted minor fixes for specialization stats. (pythonGH-100219)
  pythongh-100176: venv: Remove redundant compat code for Python <= 3.2 (python#100177)
  pythonGH-100222: Redefine _Py_CODEUNIT as a union to clarify structure of code unit. (pythonGH-100223)
  pythongh-99955: undef ERROR and SUCCESS before redefining (fixes sanitizer warning) (python#100215)
  pythonGH-100206: use versionadded for the addition of sysconfig.get_default_scheme (python#100207)
  pythongh-81057: Move _Py_RefTotal to the "Ignored Globals" List (pythongh-100203)
  pythongh-81057: Move Signal-Related Globals to _PyRuntimeState (pythongh-100085)
  pythongh-81057: Move faulthandler Globals to _PyRuntimeState (pythongh-100152)
  pythongh-81057: Move tracemalloc Globals to _PyRuntimeState (pythongh-100151)
  pythonGH-100143: Improve collecting pystats for parts of runs (pythonGH-100144)
  pythongh-99955: standardize return values of functions in compiler's code-gen (python#100010)
  pythongh-79218: Define `MS_WIN64` macro for Mingw-w64 64bit on Windows (pythonGH-100137)
  Fix: typo (Indention) (pythonGH-99904)
  pythongh-96715 Remove redundant NULL check in `profile_trampoline` function (python#96716)
  pythongh-100176: remove incorrect version compatibility check from argument clinic (python#100190)
  clarify the 4300-digit limit on int-str conversion (python#100175)
  pythongh-70393: Clarify mention of "middle" scope (python#98839)
  pythongh-99688: Fix outdated tests in test_unary (python#99712)
  pythongh-100174: [Enum] Correct PowersOfThree example. (pythonGH-100178)
  ...
@GalaxySnail GalaxySnail mentioned this pull request Dec 21, 2022
Open
This was referenced Feb 15, 2023
Merged
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zooba zooba zooba approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@GalaxySnail @zooba @bedevere-bot